Switch gettext domain from gtk30 to gtk40
authorMatthias Clasen <mclasen@redhat.com>
Fri, 7 Oct 2016 13:13:59 +0000 (09:13 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 7 Oct 2016 14:34:50 +0000 (10:34 -0400)
24 files changed:
Makefile.am
configure.ac
demos/gtk-demo/listbox.ui
docs/RELEASE-HOWTO
gtk/inspector/actions.ui
gtk/inspector/css-editor.ui
gtk/inspector/css-node-tree.ui
gtk/inspector/data-list.ui
gtk/inspector/general.ui
gtk/inspector/magnifier.ui
gtk/inspector/menu.ui
gtk/inspector/misc-info.ui
gtk/inspector/object-hierarchy.ui
gtk/inspector/object-tree.ui
gtk/inspector/prop-list.ui
gtk/inspector/resource-list.ui
gtk/inspector/selector.ui
gtk/inspector/signals-list.ui
gtk/inspector/statistics.ui
gtk/inspector/visual.ui
gtk/inspector/window.ui
make-pot
po-properties/Makevars
po/Makevars

index 2d10b20520cdf70f54acd365a735bd026c090a3e..f2cb7e2afa90235ce06e15b68c3c11b2637cfb78 100644 (file)
@@ -104,6 +104,6 @@ AM_DISTCHECK_CONFIGURE_FLAGS =              \
        --enable-installed-tests
 
 GITIGNORE_TRANSLATION_DIRS = po-properties
-GITIGNOREFILES = po-properties/gtk30-properties.pot
+GITIGNOREFILES = po-properties/gtk40-properties.pot
 
 -include $(top_srcdir)/git.mk
index afe7defc4b81fb3b468ee6508814e4ce7bb62b74..c6b229f902c839e4d813542ec8b6f41c51291a01 100644 (file)
@@ -168,7 +168,7 @@ AC_USE_SYSTEM_EXTENSIONS
 AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION([0.19.7])
 
-GETTEXT_PACKAGE=gtk30
+GETTEXT_PACKAGE=gtk40
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
                    [The prefix for our gettext translation domains.])
index 8e612270696222184d4eb04695c518e65131bff1..db0ce6e76ce4d6127f25bb91f4ff847228ae1218 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <!-- interface-requires gtk+ 3.10 -->
   <!-- interface-requires gtkdemo 3.10 -->
   <object class="GtkMenu" id="menu1">
index 1c4d201280911c29512b56b56745de02f18d2bf0..b3c66ac24790f75e66b050ad377272eb42e93d31 100644 (file)
@@ -28,8 +28,8 @@ Make sure that gtk-doc is the latest released version.
 
  3) Update the pot files and commit the changes:
 
-    make -C po gtk30.pot
-    make -C po-properties gtk30-properties.pot
+    make -C po gtk40.pot
+    make -C po-properties gtk40-properties.pot
 
  4) In particular, if this is a major, stable, release, verify that
     README.in contains the relevant release notes and that the
index c87a06bac607103e97e07a6de0a3abef929ac799..aa33bc0585eced65b0b9e6d8d59bb0d0795ae016 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkListStore" id="model">
     <columns>
       <column type="gchararray"/>
index ad6919761241fcaf9d64db8f513c070fd9d18647..9bfd973a166eea90e7427b615e0b20b05d6f7d64 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkTextTagTable" id="tags">
     <child type="tag">
       <object class="GtkTextTag">
index a40982ee4d98480d95dc7a164ec296c699d832fa..1fff833f7a3129e4a7fee1b72ea73e67e48aab0b 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkListStore" id="prop_model">
     <columns>
       <column type="gchararray"/>
index b436213486a14fd5fb1187d748b7586980c780c5..e9905532d7ca870e87737227c5f494ff257dfe4c 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <template class="GtkInspectorDataList" parent="GtkBox">
     <property name="orientation">vertical</property>
     <child>
index e2ff8e9250b7a5525643a6916d5b26849efdd2ba..527d63ed1b28b1cb15abd6faf7e74f4a12227c6e 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <template class="GtkInspectorGeneral" parent="GtkScrolledWindow">
     <property name="hscrollbar-policy">never</property>
     <property name="vscrollbar-policy">automatic</property>
index e4264082c1f4212eb6cca19c066b0f717178e1ab..8bf7f621514d9c848f526cac79889f05ff3a1913 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <template class="GtkInspectorMagnifier" parent="GtkBox">
     <property name="orientation">vertical</property>
     <child>
index 970bc6b29e9007ff43e3298bdf76947a49385601..51cbf99756b24bb8e2fe7ae6994e1f54c822c24e 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkTreeStore" id="model">
     <columns>
       <column type="gchararray"/> <!-- type -->
index 0f1546a3b02ceff640f5eed08e777dae1ae5b43e..a5bc70d388d652f20e42e3bd7f2d4897164c42a5 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <template class="GtkInspectorMiscInfo" parent="GtkScrolledWindow">
     <child>
       <object class="GtkBox">
index 0f5c61b796f4ed85be1ef5a62cdacac4ea6070ff..8afcb5cfdda38f5ef4db8502ce0b40716eec0834 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkTreeStore" id="model">
     <columns>
       <column type="gchararray"/>
index 95abc05f3cc5feb6b53416c13be5ea3daf6b62e4..0229a93bcd695a1c2b11620aa2dd49e37df0dc35 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkTreeStore" id="model">
     <columns>
       <column type="gpointer"/>
index f4892cc8940deaaf8c51fffa28c5db2980b97aca..c1475a12a709088c8a448fefde9531e13ab15238 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkListStore" id="model">
     <columns>
       <column type="gchararray"/>
index 2907a73ef4859f75de16e363bff420b5e516a50d..5178a9280f04770de2119be854c0d1130763e408 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkTreeStore" id="model">
     <columns>
       <column type="gchararray"/>
index db008753b9fd967c45b40334d8cd1894a6643551..02278fa1472fe470593c7dc8cf29772c2b986ec5 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkTreeStore" id="model">
     <columns>
       <column type="gchararray"/>
index b173c24bb9b9b02e8d6d435a9752646754bd23ca..5710a6b6babec9c20ef1a6bc4c65970826eb3e68 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkListStore" id="model">
     <columns>
       <column type="gchararray"/>
index b1ceefce4e348476746ea2129d6f307654eb89d4..20e62618d4dbb903a8a2a297d3daa5b2552d92ed 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkListStore" id="model">
     <columns>
       <column type="GType"/>
index 9f30af87bbd8939eb466b9271398a94034d013ad..4bf1867042109e1983a5c8f3ac8b57f738649068 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkAdjustment" id="scale_adjustment">
     <property name="lower">1</property>
     <property name="upper">2</property>
index 33592cd9c3f21c6e5ffaa062217efae9af15b950..c2a0ccfb5b50da6cde6d6d82406a65472bcd7e7c 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk30">
+<interface domain="gtk40">
   <object class="GtkAdjustment" id="magnification_adjustment">
     <property name="lower">1.0</property>
     <property name="upper">5.0</property>
index 1abb5905e3819c97738c8dd6e01faba6909ff600..e95e971f30eed472d4c89c609fa93bb298db5b7d 100755 (executable)
--- a/make-pot
+++ b/make-pot
@@ -9,11 +9,11 @@
 #
 #   ./make-pot
 #
-# to generate po/gtk30.pot, and like this:
+# to generate po/gtk40.pot, and like this:
 #
 #   ./make-pot properties
 #
-# to generate po-properties/gtk30-properties.pot.
+# to generate po-properties/gtk40-properties.pot.
 #
 # Various things can be passed in by environment variables, which
 # are heavily inspired by the variables used in po/Makefile.in.in:
@@ -23,7 +23,7 @@
 # srcdir - the directory where POTFILES.in is located (defaults to
 #          $top_srcdir/po or $top_srcdir/po-properties)
 # GETTEXT_PACKAGE - the gettext domain, used for naming the resulting
-#          .pot file (defaults to gtk30 or gtk30-properties)
+#          .pot file (defaults to gtk40 or gtk40-properties)
 # XGETTEXT_KEYWORDS - --keyword arguments to pass to xgettext
 
 
@@ -32,11 +32,11 @@ top_srcdir="${top_srcdir:-.}"
 
 if test "$1" = "properties"; then
   srcdir="${srcdir:-$top_srcdir/po-properties}"
-  GETTEXT_PACKAGE="${GETTEXT_PACKAGE:-gtk30-properties}"
+  GETTEXT_PACKAGE="${GETTEXT_PACKAGE:-gtk40-properties}"
   XGETTEXT_KEYWORDS="${XGETTEXT_KEYWORDS:- --keyword --keyword=P_ }"
 else
   srcdir="${srcdir:-$top_srcdir/po}"
-  GETTEXT_PACKAGE="${GETTEXT_PACKAGE:-gtk30}"
+  GETTEXT_PACKAGE="${GETTEXT_PACKAGE:-gtk40}"
   XGETTEXT_KEYWORDS="${XGETTEXT_KEYWORDS:- --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 }"
 fi
 
index ad69e56628b7f1564a37545d462703a54575ff9a..38f3819091233fadb39c75bfdfebb1fd99fbc264 100644 (file)
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = gtk30-properties
+DOMAIN = gtk40-properties
 
 # These two variables depend on the location of this directory.
 subdir = po
index cc2d602284c985bcf8ce7d60d36c7b0d04448bcd..d8c4fccdbbe30cf6d4d111c0fc94032c8bdd036f 100644 (file)
@@ -1,7 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
 # Usually the message domain is the same as the package name.
-DOMAIN = gtk30
+DOMAIN = gtk40
 
 # These two variables depend on the location of this directory.
 subdir = po